In debug, avoid force casting if an Autoload object is freed. #92608
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cyanglaz
commented
May 31, 2024
modules/gdscript/gdscript_editor.cpp
Outdated
| @@ -403,6 +403,11 @@ void GDScriptLanguage::debug_get_globals(List<String> *p_globals, List<Variant> | |||
|
|
|||
| const Variant &var = gl_array[E.value]; | |||
| if (Object *obj = var) { | |||
| bool freed = false; | |||
| var.get_validated_object_with_check(freed); | |||
There was a problem hiding this comment.
Maybe we can create another method in Variant to just check the validity?
There was a problem hiding this comment.
Not needed as you'd always just be fetching the object, and not needed for this case see below
modules/gdscript/gdscript_editor.cpp
Outdated
| @@ -403,6 +403,11 @@ void GDScriptLanguage::debug_get_globals(List<String> *p_globals, List<Variant> | |||
|
|
|||
| const Variant &var = gl_array[E.value]; | |||
| if (Object *obj = var) { | |||
There was a problem hiding this comment.
Suggested change
| if (Object *obj = var) { | |
| bool freed = false; | |
| if (Object *obj = var.get_validated_object_with_check(freed)) { |
Instead, no need to complicate things
cleanup check freed
cyanglaz
force-pushed
the
fix_debugger_crash_invalid_object
branch
from
36fdecb to
0e4d0a2
Compare
|
@AThousandShips friendly ping, I have updated the code per your request, PTAL :) |
vnen
approved these changes
Jul 25, 2024
|
I just realized there is a previous PR doing the same thing: #89274 |
|
Superseded by #89274. Thanks for the contribution! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When checking an autoload object, they are force casted, which might result a crash if the object is freed.
This PR adds an additional check to prevent the force casting.
Fixes #92607